Auto merge of #3299 - alexcrichton:fix-tests, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 17 Nov 2016 20:45:11 +0000 (12:45 -0800)
committerGitHub <noreply@github.com>
Thu, 17 Nov 2016 20:45:11 +0000 (12:45 -0800)
Fix tests on nightly


Trivial merge